Replace fallthrough comments with G_GNUC_FALLTHROUGH

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index e4dadee359ac71cdad85a474d1528be21eb3a9b2..4699011a4232738897761f08e867cbdbb4e5551f 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -303,6 +303,7 @@ translate_device_classes (GdkDisplay      *display,
                                                      direction,
                                                      scroll_info->increment);
           }
+          break;
 #endif /* XINPUT_2_2 */
         default:
           /* Ignore */

diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index d25e620b887fab274e4632e7cd09ae06bc264c97..dfb186d336bd079267c6fa789d55c526d6598482 100644 (file)
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -1814,7 +1814,7 @@ gdk_x11_surface_set_type_hint (GdkSurface        *surface,
       break;
     default:
       g_warning ("Unknown hint %d passed to gdk_surface_set_type_hint", hint);
-      /* Fall thru */
+      G_GNUC_FALLTHROUGH;
     case GDK_SURFACE_TYPE_HINT_NORMAL:
       atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_WINDOW_TYPE_NORMAL");
       break;

diff --git a/gtk/css/gtkcsstokenizer.c b/gtk/css/gtkcsstokenizer.c
index ec965eb4204bff793200ffed385ee50a20d2b9e3..fa0cb9f0834334a670dd2036f8fa9c3ff8a02eab 100644 (file)
--- a/gtk/css/gtkcsstokenizer.c
+++ b/gtk/css/gtkcsstokenizer.c
@@ -387,7 +387,7 @@ gtk_css_token_print (const GtkCssToken *token,
     case GTK_CSS_TOKEN_SIGNED_NUMBER:
       if (token->number.number >= 0)
         g_string_append_c (string, '+');
-      /* fall through */
+      G_GNUC_FALLTHROUGH;
     case GTK_CSS_TOKEN_SIGNLESS_INTEGER:
     case GTK_CSS_TOKEN_SIGNLESS_NUMBER:
       g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE, token->number.number);
@@ -403,7 +403,7 @@ gtk_css_token_print (const GtkCssToken *token,
     case GTK_CSS_TOKEN_SIGNED_INTEGER_DIMENSION:
       if (token->dimension.value >= 0)
         g_string_append_c (string, '+');
-      /* fall through */
+      G_GNUC_FALLTHROUGH;
     case GTK_CSS_TOKEN_SIGNLESS_INTEGER_DIMENSION:
     case GTK_CSS_TOKEN_DIMENSION:
       g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE, token->dimension.value);

diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 0ccb5b72d5d51fb8579562b6417a07141aefc82e..0dd0cc742142b949bf1986faff6898bcb314aad3 100644 (file)
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -142,6 +142,7 @@ gtk_app_chooser_dialog_response (GtkDialog *dialog,
     case GTK_RESPONSE_CANCEL:
     case GTK_RESPONSE_DELETE_EVENT:
       priv->dismissed = TRUE;
+      break;
     default:
       break;
     }

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 2bfbc2ef68eb449a862e38ce076f125cddbfaabc..8a8b9d26d3b1b77da4e078b44faf02409ecdae2c 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1314,6 +1314,7 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
 
           calendar_select_and_focus_day (calendar, day);
         }
+      break;
     default:
       break;
     }

diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index b160d03bf5579cabeb74b662e3cd4c6b45d1458e..c589320cabe75cd8f6310199670b2b0db0b4d9bf 100644 (file)
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -590,7 +590,7 @@ key_controller_key_pressed (GtkEventControllerKey *key,
        {
        case GDK_KEY_BackSpace:
          cleared = TRUE;
-          /* fall thru */
+          G_GNUC_FALLTHROUGH;
        case GDK_KEY_Escape:
          goto out;
        default:

diff --git a/gtk/gtkcssdimensionvalue.c b/gtk/gtkcssdimensionvalue.c
index b54309d0795eb6a5d4d66add3db309eb5db6c915..7c918d6da1f8b2909fe139e7badf22a2ca54d96b 100644 (file)
--- a/gtk/gtkcssdimensionvalue.c
+++ b/gtk/gtkcssdimensionvalue.c
@@ -68,9 +68,6 @@ gtk_css_value_dimension_compute (GtkCssValue      *number,
 {
   switch (number->unit)
     {
-    default:
-      g_assert_not_reached();
-      G_GNUC_FALLTHROUGH;
     case GTK_CSS_PERCENT:
       /* percentages for font sizes are computed, other percentages aren't */
       if (property_id == GTK_CSS_PROPERTY_FONT_SIZE)
@@ -123,6 +120,8 @@ gtk_css_value_dimension_compute (GtkCssValue      *number,
     case GTK_CSS_MS:
       return gtk_css_dimension_value_new (number->value / 1000.0,
                                           GTK_CSS_S);
+    default:
+      g_assert_not_reached();
     }
 }
 

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 57b178ee775408b7904c7a691028f51df54128ac..ad0b36d6349d84c84f4af8296b2969e70a122630 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1527,6 +1527,7 @@ gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion,
                     case (gunichar)-2:
                     case (gunichar)-1:
                       *q = 0;
+                      break;
                     default: ;
                     }
                 }

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 1b6a03826f376947d03b5e156d7b9e6705ad64d9..73a69626ee4c2afdc303c0e4b667ac15c6f1ddd8 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -3539,8 +3539,8 @@ set_startup_mode (GtkFileChooserWidget *impl)
           operation_mode_set (impl, OPERATION_MODE_RECENT);
           break;
         }
-      /* else fall thru */
 
+      G_GNUC_FALLTHROUGH;
     case STARTUP_MODE_CWD:
       switch_to_cwd (impl);
       break;

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index acaf40f10d51abaaba8bfb2db4525bb334d3eefe..ab9a9edcedab99fbf23641b6dab3cc93d5734690 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1745,6 +1745,7 @@ gtk_icon_view_snapshot (GtkWidget   *widget,
           rect.y = dest_item->cell_area.y;
           rect.width = 2;
           rect.height = dest_item->cell_area.height;
+          break;
        case GTK_ICON_VIEW_NO_DROP:
         default:
          break;

diff --git a/gtk/gtkprintutils.c b/gtk/gtkprintutils.c
index 6bcb6dc500b43d0607834a2fcd4b6d7ec4b2cf5d..a8b1d835cc5065bb2ad625ac580c24ffb06f748d 100644 (file)
--- a/gtk/gtkprintutils.c
+++ b/gtk/gtkprintutils.c
@@ -32,7 +32,7 @@ _gtk_print_convert_to_mm (gdouble len,
     case GTK_UNIT_NONE:
     default:
       g_warning ("Unsupported unit");
-      /* Fall through */
+      G_GNUC_FALLTHROUGH;
     case GTK_UNIT_POINTS:
       return len * (MM_PER_INCH / POINTS_PER_INCH);
       break;
@@ -52,7 +52,7 @@ _gtk_print_convert_from_mm (gdouble len,
     case GTK_UNIT_NONE:
     default:
       g_warning ("Unsupported unit");
-      /* Fall through */
+      G_GNUC_FALLTHROUGH;
     case GTK_UNIT_POINTS:
       return len / (MM_PER_INCH / POINTS_PER_INCH);
       break;

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 52af78a2116da02d2da122e9e9d42508b9e0afd0..b8fbf480078f830902c4e99141f59f5dcd09af65 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -3796,8 +3796,7 @@ gtk_text_delete_from_cursor (GtkText       *self,
           start_pos = gtk_text_move_forward_word (self, start_pos, FALSE);
           start_pos = gtk_text_move_backward_word (self, start_pos, FALSE);
         }
-        
-      /* Fall through */
+      G_GNUC_FALLTHROUGH;
     case GTK_DELETE_WORD_ENDS:
       while (count < 0)
         {